bitkeeper revision 1.1023.1.4 (40e0456eh9GQjlKMip9VLoUGxtn2SA)

More merge fixes.

diff --git a/tools/xc/lib/xc_linux_save.c b/tools/xc/lib/xc_linux_save.c
index b14080625acab05e1a351ba6da3fa86e3063474d..44ffb6bb5f2a3b3f8c4b1864f39b02f491f98ffa 100644 (file)
--- a/tools/xc/lib/xc_linux_save.c
+++ b/tools/xc/lib/xc_linux_save.c
@@ -399,7 +399,7 @@ int xc_linux_save(int xc_handle, XcIOContext *ioctxt)
     if( live ){ 
         if ( xc_shadow_control( xc_handle, domid, 
                                 DOM0_SHADOW_CONTROL_OP_ENABLE_LOGDIRTY,
-                                NULL, 0, NULL ) < 0 )
+                                NULL, 0, NULL ) < 0 ) {
             xcio_error(ioctxt, "Couldn't enable shadow mode");
             goto out;
         }
@@ -544,23 +544,24 @@ int xc_linux_save(int xc_handle, XcIOContext *ioctxt)
             {
                 int n = permute(N, nr_pfns, order_nr );
 
-                if ( 0 && debug )
+                if ( 0 && debug ) {
                     fprintf(stderr,"%d pfn= %08lx mfn= %08lx %d  "
                             " [mfn]= %08lx\n",
-                            iter, n, live_pfn_to_mfn_table[n],
+                            iter, (unsigned long)n, live_pfn_to_mfn_table[n],
                             test_bit(n,to_send),
                             live_mfn_to_pfn_table[live_pfn_to_mfn_table[n]&
                                                  0xFFFFF]);
+                }
 
                 if ( !last_iter && 
                      test_bit(n, to_send) && 
-                     test_bit(n, to_skip) )
+                     test_bit(n, to_skip) ) {
                     skip_this_iter++; /* stats keeping */
                 }
 
                 if ( !((test_bit(n, to_send) && !test_bit(n, to_skip)) ||
                        (test_bit(n, to_send) && last_iter) ||
-                       (test_bit(n, to_fix)  && last_iter)) )
+                       (test_bit(n, to_fix)  && last_iter)) ) {
                     continue;
                 }
 

diff --git a/tools/xc/lib/xc_private.h b/tools/xc/lib/xc_private.h
index 2b70657e498ef774033588fc68ab64fd59faf516..742185161b3c09840d200f0368c5dfb85d3cfcc1 100644 (file)
--- a/tools/xc/lib/xc_private.h
+++ b/tools/xc/lib/xc_private.h
@@ -205,4 +205,9 @@ void * mfn_mapper_queue_entry(mfn_mapper_t *t, int offset,
 long long  xc_domain_get_cpu_usage( int xc_handle, domid_t domid );
 
 #include "xc_io.h"
+
+int xc_domain_getfullinfo(int xc_handle,
+                          u32 domid,
+                          dom0_op_t *op,
+                          full_execution_context_t *ctxt );
 #endif /* __XC_PRIVATE_H__ */

diff --git a/tools/xen/lib/xend/sxp.py b/tools/xen/lib/xend/sxp.py
index a08a0b6c0f96e48dc723944da1396f29878eed81..01654a23779ea11ecf6d7285b6f91519f656954a 100644 (file)
--- a/tools/xen/lib/xend/sxp.py
+++ b/tools/xen/lib/xend/sxp.py
@@ -529,7 +529,7 @@ def to_string(sxpr):
     returns string
     """
     io = StringIO()
-    sxp.show(sxpr, io)
+    show(sxpr, io)
     io.seek(0)
     val = io.getvalue()
     io.close()